*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a0fa0526d34dbd32647e95d70596423f4bddcc9..ab312990347b8ab6d394f3b2d66b8ec7b37b94fd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-03  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-ftp.el (tramp-ftp-file-name-handler): Disable
+       `file-name-handler-alist' when loading 'ange-ftp.  Otherwise,
+       there could be recursive loading when `default-directory' is a
+       remote file name.  (Bug#4614)
+
 2009-10-03  Glenn Morris  <rgm@gnu.org>
 
        * calendar/calendar.el (calendar-basic-setup): Handle the case where